build: Make sysprof truly optional

We are falling back to the sysprof subproject even if sysprof support
has been explicitly disabled.

Fixes: #3118

diff --git a/meson.build b/meson.build
index c520298a849ea02ccbfdf0166ed16ff6ae4f8f4d..1ef6b16f2cc36fdab04f9c88719186444ee43768 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -672,35 +672,41 @@ cloudproviders_dep = dependency('cloudproviders',
   ])
 cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
 
-profiler_enabled = get_option('sysprof').enabled()
 # libsysprof-capture support
-libsysprof_capture_dep = dependency('sysprof-capture-4',
-  required: get_option('sysprof'),
-  default_options: [
-    'enable_examples=false',
-    'enable_gtk=false',
-    'enable_tests=false',
-    'enable_tools=false',
-    'libsysprof=true',
-    'with_sysprofd=none',
-    'help=false',
-  ],
-  fallback: ['sysprof', 'libsysprof_capture_dep'],
-)
-cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
-libsysprof_dep = dependency('sysprof-4',
-  required: false,
-  default_options: [
-    'enable_examples=false',
-    'enable_gtk=false',
-    'enable_tests=false',
-    'enable_tools=false',
-    'libsysprof=true',
-    'with_sysprofd=none',
-    'help=false',
-  ],
-  fallback: ['sysprof', 'libsysprof_dep'],
-)
+if not get_option('sysprof').disabled()
+  libsysprof_capture_dep = dependency('sysprof-capture-4',
+    required: get_option('sysprof'),
+    default_options: [
+      'enable_examples=false',
+      'enable_gtk=false',
+      'enable_tests=false',
+      'enable_tools=false',
+      'libsysprof=true',
+      'with_sysprofd=none',
+      'help=false',
+    ],
+    fallback: ['sysprof', 'libsysprof_capture_dep'],
+  )
+  cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
+  libsysprof_dep = dependency('sysprof-4',
+    required: false,
+    default_options: [
+      'enable_examples=false',
+      'enable_gtk=false',
+      'enable_tests=false',
+      'enable_tools=false',
+      'libsysprof=true',
+      'with_sysprofd=none',
+      'help=false',
+    ],
+    fallback: ['sysprof', 'libsysprof_dep'],
+  )
+  profiler_enabled = true
+else
+  libsysprof_capture_dep = disabler()
+  libsysprof_dep = disabler()
+  profiler_enabled = false
+endif
 
 graphene_dep_type = graphene_dep.type_name()
 if graphene_dep_type == 'pkgconfig'